Require swap syncd before running disable VOQ watchdog #21102
Conversation
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
Hi @StormLiangMS, please help review/signoff this one |
yyynini
left a comment
yyynini
left a comment
There was a problem hiding this comment.
Adding this causes the test_pfc_watermark_extra_lossless_active test to fail.
For inner_dscp, outer_dscp, prio, queue = (3, 2, 3, 3): E Failed to detect congestion due to PFC pause, failed check 19200 > 29200 E For inner_dscp, outer_dscp, prio, queue = (4, 6, 4, 4): E Failed to detect congestion due to PFC pause, failed check 19200 > 29200
Could you help me understand why this is happening?
test_pfc_watermark_extra_lossless_active.log
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@yyynini added a dependency for setup_module for swapsyncd to make sure counterpolling is disabled after the swap. |
|
Hi @yyynini, please verify the latest change, thanks! |
|
@rbpittman I'm still seeing the same failure in test_pfc_watermark_extra_lossless_active. |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
yyynini
left a comment
yyynini
left a comment
There was a problem hiding this comment.
The entire test_tunnel_qos_remap run passed successfully.
lgtm
What is the motivation for this PR? How did you do it? How did you verify/test it? Validated on master branch qos/test_tunnel_qos_remap.py on hash 20aae03 without extra parameters (for example, without "--qos_swap_syncd=False" or disabling loganalyzer) Validated on 202411 active watermark test case passes =============================================== 10 passed, 7 skipped, 851 warnings in 8220.27s (2:17:00) ============= sonic-mgmt$ git log -n 1 commit 20aae03 (HEAD -> voq_wd_syncd_swap_issue_master, origin/voq_wd_syncd_swap_issue_master) Author: Randall Pittman <[email protected]> Date: Wed Nov 5 23:25:14 2025 +0000 Require swap_syncd before setup_module.
|
Cherry-pick PR to 202411: #21302 |
|
@rbpittman PR conflicts with 202505 branch |
What is the motivation for this PR? How did you do it? How did you verify/test it? Validated on master branch qos/test_tunnel_qos_remap.py on hash 20aae03 without extra parameters (for example, without "--qos_swap_syncd=False" or disabling loganalyzer) Validated on 202411 active watermark test case passes =============================================== 10 passed, 7 skipped, 851 warnings in 8220.27s (2:17:00) ============= sonic-mgmt$ git log -n 1 commit 20aae03 (HEAD -> voq_wd_syncd_swap_issue_master, origin/voq_wd_syncd_swap_issue_master) Author: Randall Pittman <[email protected]> Date: Wed Nov 5 23:25:14 2025 +0000 Require swap_syncd before setup_module.
What is the motivation for this PR? How did you do it? How did you verify/test it? Validated on master branch qos/test_tunnel_qos_remap.py on hash 20aae03 without extra parameters (for example, without "--qos_swap_syncd=False" or disabling loganalyzer) Validated on 202411 active watermark test case passes =============================================== 10 passed, 7 skipped, 851 warnings in 8220.27s (2:17:00) ============= sonic-mgmt$ git log -n 1 commit 20aae03 (HEAD -> voq_wd_syncd_swap_issue_master, origin/voq_wd_syncd_swap_issue_master) Author: Randall Pittman <[email protected]> Date: Wed Nov 5 23:25:14 2025 +0000 Require swap_syncd before setup_module.
What is the motivation for this PR? How did you do it? How did you verify/test it? Validated on master branch qos/test_tunnel_qos_remap.py on hash 20aae03 without extra parameters (for example, without "--qos_swap_syncd=False" or disabling loganalyzer) Validated on 202411 active watermark test case passes =============================================== 10 passed, 7 skipped, 851 warnings in 8220.27s (2:17:00) ============= sonic-mgmt$ git log -n 1 commit 20aae03 (HEAD -> voq_wd_syncd_swap_issue_master, origin/voq_wd_syncd_swap_issue_master) Author: Randall Pittman <[email protected]> Date: Wed Nov 5 23:25:14 2025 +0000 Require swap_syncd before setup_module.
mssonicbld
added
Included in 202411 branch
and removed
Created PR to 202411 branch
labels
8 participants
Description of PR
Summary:
Fixes issue with order of operations when syncd container is dynamically swapped during test_tunnel_qos_remap.py with respect to the VOQ Watchdog disabler.
The VOQ watchdog fixture runs first because it has no dependency on the syncd swap. Thus the WD is temporarily disabled, but then the syncd-swap (config reload) reload re-enables it.
Fix by requiring the syncd_swap to be performed before the disable_voq_watchdog_dualtor fixture runs.
Type of change
Back port request
Approach
What is the motivation for this PR?
How did you do it?
How did you verify/test it?
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation